From 6ab562d8625b0296c45a55020f6b4a2f9387ea25 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Thu, 13 Feb 2014 03:32:02 +0000 Subject: [PATCH] Use packet references instead of large copies. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4737 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/jeeps/gpsapp.cc | 14 +++++++------- gpsbabel/jeeps/gpsapp.h | 6 +++--- gpsbabel/jeeps/gpsrqst.cc | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gpsbabel/jeeps/gpsapp.cc b/gpsbabel/jeeps/gpsapp.cc index 525590da2..7a6108ef8 100644 --- a/gpsbabel/jeeps/gpsapp.cc +++ b/gpsbabel/jeeps/gpsapp.cc @@ -5830,7 +5830,7 @@ int32 GPS_A600_Send(const char* port, time_t Time) switch (gps_date_time_type) { case pD600: - GPS_D600_Send(&tra,Time); + GPS_D600_Send(tra,Time); break; default: GPS_Error("A600_Send: Unknown data/time protocol"); @@ -5928,7 +5928,7 @@ time_t GPS_D600_Get(GPS_PPacket packet) ** ** @return [void] ************************************************************************/ -void GPS_D600_Send(GPS_PPacket* packet, time_t Time) +void GPS_D600_Send(GPS_PPacket& packet, time_t Time) { UC data[10]; UC* p; @@ -5948,7 +5948,7 @@ void GPS_D600_Send(GPS_PPacket* packet, time_t Time) *p++ = ts->tm_min; *p = ts->tm_sec; - GPS_Make_Packet(packet, LINK_ID[gps_link_type].Pid_Date_Time_Data, + GPS_Make_Packet(&packet, LINK_ID[gps_link_type].Pid_Date_Time_Data, data,8); return; @@ -6038,7 +6038,7 @@ int32 GPS_A700_Send(const char* port, double lat, double lon) switch (gps_position_type) { case pD700: - GPS_D700_Send(&tra,lat,lon); + GPS_D700_Send(tra,lat,lon); break; default: GPS_Error("A700_Send: Unknown position protocol"); @@ -6102,7 +6102,7 @@ void GPS_D700_Get(GPS_PPacket packet, double* lat, double* lon) ** ** @return [void] ************************************************************************/ -void GPS_D700_Send(GPS_PPacket* packet, double lat, double lon) +void GPS_D700_Send(GPS_PPacket& packet, double lat, double lon) { UC data[16]; UC* p; @@ -6116,7 +6116,7 @@ void GPS_D700_Send(GPS_PPacket* packet, double lat, double lon) p+=sizeof(double); GPS_Util_Put_Double(p,lon); - GPS_Make_Packet(packet, LINK_ID[gps_link_type].Pid_Position_Data, + GPS_Make_Packet(&packet, LINK_ID[gps_link_type].Pid_Position_Data, data,16); return; @@ -6247,7 +6247,7 @@ int32 GPS_A800_Get(gpsdevh** fd, GPS_PPvt_Data* packet) ** ** @return [void] ************************************************************************/ -void GPS_D800_Get(GPS_PPacket packet, GPS_PPvt_Data* pvt) +void GPS_D800_Get(GPS_PPacket& packet, GPS_PPvt_Data* pvt) { UC* p; diff --git a/gpsbabel/jeeps/gpsapp.h b/gpsbabel/jeeps/gpsapp.h index 2d97110eb..e6508154b 100644 --- a/gpsbabel/jeeps/gpsapp.h +++ b/gpsbabel/jeeps/gpsapp.h @@ -43,17 +43,17 @@ time_t GPS_A600_Get(const char* port); time_t GPS_D600_Get(GPS_PPacket packet); int32 GPS_A600_Send(const char* port, time_t Time); - void GPS_D600_Send(GPS_PPacket* packet, time_t Time); + void GPS_D600_Send(GPS_PPacket& packet, time_t Time); int32 GPS_A700_Get(const char* port, double* lat, double* lon); int32 GPS_A700_Send(const char* port, double lat, double lon); void GPS_D700_Get(GPS_PPacket packet, double* lat, double* lon); - void GPS_D700_Send(GPS_PPacket* packet, double lat, double lon); + void GPS_D700_Send(GPS_PPacket& packet, double lat, double lon); int32 GPS_A800_On(const char* port, gpsdevh** fd); int32 GPS_A800_Off(const char* port, gpsdevh** fd); int32 GPS_A800_Get(gpsdevh** fd, GPS_PPvt_Data* packet); - void GPS_D800_Get(GPS_PPacket packet, GPS_PPvt_Data* pvt); + void GPS_D800_Get(GPS_PPacket& packet, GPS_PPvt_Data* pvt); int32 GPS_A906_Get(const char* port, GPS_PLap** lap, pcb_fn cb); void GPS_D1011b_Get(GPS_PLap* Lap,UC* data); /*D906 D1001 D1015*/ diff --git a/gpsbabel/jeeps/gpsrqst.cc b/gpsbabel/jeeps/gpsrqst.cc index 7ae125c37..24390ec03 100644 --- a/gpsbabel/jeeps/gpsrqst.cc +++ b/gpsbabel/jeeps/gpsrqst.cc @@ -74,7 +74,7 @@ static int32 GPS_A600_Rqst(gpsdevh* fd, time_t Time) switch (gps_date_time_type) { case pD600: - GPS_D600_Send(&tra,Time); + GPS_D600_Send(tra,Time); break; default: GPS_Error("A600_Rqst: Unknown data/time protocol"); @@ -139,7 +139,7 @@ static int32 GPS_A700_Rqst(gpsdevh* fd, double lat, double lon) switch (gps_position_type) { case pD700: - GPS_D700_Send(&tra,lat,lon); + GPS_D700_Send(tra,lat,lon); break; default: GPS_Error("A700_Rqst: Unknown position protocol"); -- 2.30.2